Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:12:05 +0000 (06:12 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:12:05 +0000 (06:12 -0500)
commit0fa18ef05faafde6b13a4eaa2e4b34cf5e762358
tree103cbc0b2142a4489b9ec0babc274bd29af57ea7
parentc7f0a51219f70af4b685304122d5b3ae472af7d0
parent5714be8188eec66f9daeb069e3e39f7488b35a8f
Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master